Skip to content

OCPBUGS-82497: Rebase v3.6.13 for openshift-4.22 - #393

Open
dusk125 wants to merge 143 commits into
openshift:openshift-4.22from
dusk125:rebase-4.22-v3.6.13
Open

OCPBUGS-82497: Rebase v3.6.13 for openshift-4.22#393
dusk125 wants to merge 143 commits into
openshift:openshift-4.22from
dusk125:rebase-4.22-v3.6.13

Conversation

@dusk125

@dusk125 dusk125 commented Jul 6, 2026

Copy link
Copy Markdown

No description provided.

serathius and others added 30 commits September 23, 2025 17:47
…st negative revision

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
…ry-pick-20693-to-release-3.6

[release-3.6] Reject watch request with -1 revision to prevent invalid resync behavior on uncompacted etcd and make rangeEvents safe against negative revision.
When EOF is encountered during TLS handshake, it is still logged as a
warning. This seems excessive and not really useful.

This patch ensures EOF is logged on debug only.

Signed-off-by: Ondra Kupka <okupka@redhat.com>
…ry-pick-20568-to-release-3.6

[release-3.6] server/embed: Log EOF on DEBUG in TLS handshake
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: hwdef <hwdefcom@outlook.com>
Adds two test cases for the member promote operation when auth is
enabled. In the first case, the member promote request is submitted to
the leader, and in the second case it's submitted to the follower. The
leader case succeeds. In the other case, the follower forwards the
promote request to the leader. But, the forwarded request fails due to
a bug. The logs on the leader include this message:

```
failed to promote a member
```

as well as the error:

```
auth: user name is empty
```

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
When auth is enabled, sending a promotion request to a follower node was failing because
the auth token was not being propagated when the follower forwards the request to the leader.

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
…ry-pick-20792-to-release-3.6

[release-3.6] etcdserver: Fix: cannot promote member from follower when auth is enabled
…move learner issue

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
…ry-pick-20894-to-release-3.6

[release-3.6] Fix the issue that `--force-new-cluster` can't clean up learner after creating v2 snapshot
Signed-off-by: ronaldngounou <ronald.ngounou@yahoo.com>
…12410

[release-3.6] Bump from go1.24.9 to go1.24.10
…ry-pick-20887-to-release-3.6

[release-3.6] fix duplicate metrics collector registration attempted
Signed-off-by: Ivan Valdes <iv@a.ki>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.6] Print token fingerprint instead of the original tokens in log messages
Signed-off-by: hwdef <hwdefcom@outlook.com>
Addresses CVE-2025-47914, CVE-2025-58181.

Signed-off-by: Ivan Valdes <ivan@vald.es>
[release-3.6] dependency: Bump golang.org/x/crypto from 0.36.0 to 0.45.0
Signed-off-by: joshjms <joshjms1607@gmail.com>
Running genproto fails with:

% (cd tools/mod && 'go' 'install' 'golang.org/x/tools/cmd/goimports')
stderr: /home/prow/go/pkg/mod/golang.org/x/tools@v0.38.0/cmd/goimports/goimports.go:23:2: missing go.sum entry for module providing package golang.org/x/telemetry/counter (imported by golang.org/x/tools/cmd/goimports); to add:
stderr: go get golang.org/x/tools/cmd/goimports@v0.38.0
FAIL: (code:1):
  % (cd tools/mod && 'go' 'install' 'golang.org/x/tools/cmd/goimports')
Failed to install tool 'golang.org/x/tools/cmd/goimports'

Signed-off-by: Ivan Valdes <ivan@vald.es>
@openshift-ci
openshift-ci Bot requested review from deads2k and tjungblu July 6, 2026 17:15
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 6, 2026
@dusk125

dusk125 commented Jul 14, 2026

Copy link
Copy Markdown
Author

/retest-required

@dusk125

dusk125 commented Jul 20, 2026

Copy link
Copy Markdown
Author

/retest

@dusk125

dusk125 commented Jul 22, 2026

Copy link
Copy Markdown
Author

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jul 22, 2026
@dusk125

dusk125 commented Jul 22, 2026

Copy link
Copy Markdown
Author

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 22, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@dusk125: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@hasbro17

Copy link
Copy Markdown

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2026
@dusk125

dusk125 commented Jul 24, 2026

Copy link
Copy Markdown
Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@dusk125: This pull request references Jira Issue OCPBUGS-82497, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-94014 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-94014 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents

Requesting review from QA contact:
/cc @sandeepknd

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
openshift-ci Bot requested a review from sandeepknd July 24, 2026 13:03
@sandeepknd

Copy link
Copy Markdown

/lgtm from QE.

@openshift-ci

openshift-ci Bot commented Jul 24, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, hasbro17, sandeepknd

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dusk125

dusk125 commented Jul 27, 2026

Copy link
Copy Markdown
Author

/test upstream-e2e

@benluddy

Copy link
Copy Markdown

/label staff-eng-approved

Thanks, please unhold when you're satisfied with the optional presubmits.

/hold

@openshift-ci openshift-ci Bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead). labels Jul 27, 2026
@dusk125

dusk125 commented Jul 27, 2026

Copy link
Copy Markdown
Author

/test upstream-e2e

@openshift-ci

openshift-ci Bot commented Jul 27, 2026

Copy link
Copy Markdown

@dusk125: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/upstream-integration 2dfb18d link false /test upstream-integration
ci/prow/upstream-e2e 2dfb18d link false /test upstream-e2e

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead). verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.